From 42e089b02a5ef49f0d641442f8f3aaff0de3dfe2 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Mon, 15 Aug 2022 15:16:51 +0100 Subject: [PATCH] Stop skipping tests that (should) pass on mips*el when we force softpipe --- ...ng-tests-on-mips-family-architecture.patch | 83 ------------------- debian/patches/series | 1 - 2 files changed, 84 deletions(-) delete mode 100644 debian/patches/debian/Skip-some-known-failing-tests-on-mips-family-architecture.patch diff --git a/debian/patches/debian/Skip-some-known-failing-tests-on-mips-family-architecture.patch b/debian/patches/debian/Skip-some-known-failing-tests-on-mips-family-architecture.patch deleted file mode 100644 index f24191231a..0000000000 --- a/debian/patches/debian/Skip-some-known-failing-tests-on-mips-family-architecture.patch +++ /dev/null @@ -1,83 +0,0 @@ -From: Simon McVittie -Date: Thu, 2 Sep 2021 23:31:54 +0100 -Subject: Skip some known-failing tests on mips-family architectures - -Forwarded: no ---- - testsuite/gsk/meson.build | 10 ++++++++-- - testsuite/reftests/meson.build | 19 +++++++++++++------ - 2 files changed, 21 insertions(+), 8 deletions(-) - -diff --git a/testsuite/gsk/meson.build b/testsuite/gsk/meson.build -index 2fb0208..8c3ff1f 100644 ---- a/testsuite/gsk/meson.build -+++ b/testsuite/gsk/meson.build -@@ -77,9 +77,7 @@ compare_render_tests = [ - 'scale-up-down', - 'shadow-in-opacity', - 'texture-url', -- 'repeat', - 'repeat-no-repeat', -- 'repeat-negative-coords', - 'repeat-texture', - 'transform-in-transform', - 'transform-in-transform-in-transform', -@@ -87,6 +85,14 @@ compare_render_tests = [ - 'rounded-clip-in-clip-3d', # not really 3d, but cairo fails it - ] - -+if not host_machine.cpu_family().contains('mips') -+ # https://gitlab.gnome.org/GNOME/gtk/-/issues/4228 -+ compare_render_tests += [ -+ 'repeat', -+ 'repeat-negative-coords', -+ ] -+endif -+ - # these are too sensitive to differences in the renderers - # to run in ci, but still useful to keep around - informative_render_tests = [ -diff --git a/testsuite/reftests/meson.build b/testsuite/reftests/meson.build -index 301f8bd..2c6e104 100644 ---- a/testsuite/reftests/meson.build -+++ b/testsuite/reftests/meson.build -@@ -71,9 +71,6 @@ testdata = [ - 'background-area.css', - 'background-area.ref.ui', - 'background-area.ui', -- 'background-blend-mode-clip-interaction.css', -- 'background-blend-mode-clip-interaction.ref.ui', -- 'background-blend-mode-clip-interaction.ui', - 'background-color-transparent.css', - 'background-color-transparent.ref.ui', - 'background-color-transparent.ui', -@@ -92,9 +89,6 @@ testdata = [ - 'background-position-repeat.ref.ui', - 'background-position-repeat.ui', - 'background-position-repeat-bg.png', -- 'background-position-simple.css', -- 'background-position-simple.ref.ui', -- 'background-position-simple.ui', - 'background-repeat-clip.css', - 'background-repeat-clip.ref.ui', - 'background-repeat-clip.ui', -@@ -582,6 +576,19 @@ xfails = [ - 'border-half-pixel.ui' - ] - -+if not host_machine.cpu_family().contains('mips') -+ testdata += [ -+ # https://gitlab.gnome.org/GNOME/gtk/-/issues/4618 -+ 'background-blend-mode-clip-interaction.css', -+ 'background-blend-mode-clip-interaction.ref.ui', -+ 'background-blend-mode-clip-interaction.ui', -+ # https://gitlab.gnome.org/GNOME/gtk/-/issues/4228 -+ 'background-position-simple.css', -+ 'background-position-simple.ref.ui', -+ 'background-position-simple.ui', -+ ] -+endif -+ - reftest_env = environment() - reftest_env.set('GTK_A11Y', 'test') - reftest_env.set('G_TEST_SRCDIR', meson.current_source_dir()) diff --git a/debian/patches/series b/debian/patches/series index 942bdadf59..5a452037e5 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ reftest_compare_surfaces-Report-how-much-the-images-diffe.patch reftests-Allow-minor-differences-to-be-tolerated.patch -debian/Skip-some-known-failing-tests-on-mips-family-architecture.patch debian/Disable-clipboard-test.patch -- 2.30.2